Skip to content

Conversation

Qelxiros
Copy link
Contributor

@Qelxiros Qelxiros commented Sep 18, 2025

Tracking issue: #146724
r? @tgross35

@rustbot
Copy link
Collaborator

rustbot commented Sep 18, 2025

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Sep 18, 2025
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Sep 19, 2025

☔ The latest upstream changes (presumably #146700) made this pull request unmergeable. Please resolve the merge conflicts.

@rustbot

This comment has been minimized.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You dropped the part of the patch were you are removing these intrinsics from Miri?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming this was in response to #146735 (comment) but of course it should be fixed. Any idea why that failed? The implementation looks the same.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's just a rebase gone wrong.

const RAW_1337: Self;
const RAW_MINUS_14_DOT_25: Self;
const MUL_ADD_RESULT: Self;
const NEG_MUL_ADD_RESULT: Self;
Copy link
Member

@RalfJung RalfJung Sep 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These names are completely meaningless.

I don't know what is a good way to make these tests generic (@tgross35, any ideas?), but if they end up as constants here then the trait has to document what the value of these constants should be.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No ideas :( this kind of thing is always a bit of a pain point when the four types need different constants. I think a doc comment on the trait is sufficient, not that pretty but still easier than splitting out four different functions just for two test cases.

@Qelxiros Qelxiros force-pushed the const_mul_add branch 2 times, most recently from 8d9dded to aa886e4 Compare September 22, 2025 12:07
@rust-log-analyzer

This comment has been minimized.

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The library changes lgtm. The miri/ctfe bits also look reasonable with the exception of one comment, but I'll let Ralf confirm.

r? @RalfJung

View changes since this review

@rustbot rustbot assigned RalfJung and unassigned tgross35 Sep 22, 2025
@bors
Copy link
Collaborator

bors commented Sep 22, 2025

☔ The latest upstream changes (presumably #146683) made this pull request unmergeable. Please resolve the merge conflicts.

@tgross35

This comment was marked as outdated.

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Sep 24, 2025
unstably constify float mul_add methods

try-job: x86_64-mingw-2
@rust-log-analyzer

This comment was marked as outdated.

@rust-bors

This comment was marked as outdated.

@Qelxiros
Copy link
Contributor Author

Looks like installing ninja failed because the hostname didn't resolve, but the link from the script (https://ci-mirrors.rust-lang.org/2024-03-28-v1.11.1-ninja-win.zip) also looks broken?

@RalfJung
Copy link
Member

Probably some sort of network/intermittent issue. Let's just try again in a few hours.

@tgross35
Copy link
Contributor

@bors2 try jobs=x86_64-mingw-2

rust-bors bot added a commit that referenced this pull request Sep 24, 2025
unstably constify float mul_add methods

try-job: x86_64-mingw-2
@rust-bors

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Sep 24, 2025

☀️ Try build successful (CI)
Build commit: d4fd3b1 (d4fd3b1986d2a895654b4454516e15f41f05f3b8, parent: 15283f6fe95e5b604273d13a428bab5fc0788f5a)

@tgross35
Copy link
Contributor

@bors r=tgross35,RalfJung

@bors
Copy link
Collaborator

bors commented Sep 24, 2025

📌 Commit a00f241 has been approved by tgross35,RalfJung

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 24, 2025
@tgross35
Copy link
Contributor

That was just a missed gate, can probably get rolled up again
@bors rollup=maybe

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 25, 2025
…,RalfJung

unstably constify float mul_add methods

Tracking issue: rust-lang#146724
r? ``@tgross35``
bors added a commit that referenced this pull request Sep 25, 2025
Rollup of 14 pull requests

Successful merges:

 - #145067 (RawVecInner: add missing `unsafe` to unsafe fns)
 - #145277 (Do not materialise X in [X; 0] when X is unsizing a const)
 - #145973 (Add `std` support for `armv7a-vex-v5`)
 - #146667 (Add an attribute to check the number of lanes in a SIMD vector after monomorphization)
 - #146735 (unstably constify float mul_add methods)
 - #146737 (f16_f128: enable some more tests in Miri)
 - #146766 (Add attributes for #[global_allocator] functions)
 - #146905 (llvm: update remarks support on LLVM 22)
 - #146982 (Remove erroneous normalization step in `tests/run-make/linker-warning`)
 - #147005 (Small string formatting cleanup)
 - #147007 (Explicitly note `&[SocketAddr]` impl of `ToSocketAddrs`)
 - #147008 (bootstrap.py: Respect build.jobs while building bootstrap tool)
 - #147013 (rustdoc: Fix documentation for `--doctest-build-arg`)
 - #147015 (Use `LLVMDisposeTargetMachine`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8e62f95 into rust-lang:master Sep 25, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 25, 2025
rust-timer added a commit that referenced this pull request Sep 25, 2025
Rollup merge of #146735 - Qelxiros:const_mul_add, r=tgross35,RalfJung

unstably constify float mul_add methods

Tracking issue: #146724
r? `@tgross35`
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Sep 26, 2025
Rollup of 14 pull requests

Successful merges:

 - rust-lang/rust#145067 (RawVecInner: add missing `unsafe` to unsafe fns)
 - rust-lang/rust#145277 (Do not materialise X in [X; 0] when X is unsizing a const)
 - rust-lang/rust#145973 (Add `std` support for `armv7a-vex-v5`)
 - rust-lang/rust#146667 (Add an attribute to check the number of lanes in a SIMD vector after monomorphization)
 - rust-lang/rust#146735 (unstably constify float mul_add methods)
 - rust-lang/rust#146737 (f16_f128: enable some more tests in Miri)
 - rust-lang/rust#146766 (Add attributes for #[global_allocator] functions)
 - rust-lang/rust#146905 (llvm: update remarks support on LLVM 22)
 - rust-lang/rust#146982 (Remove erroneous normalization step in `tests/run-make/linker-warning`)
 - rust-lang/rust#147005 (Small string formatting cleanup)
 - rust-lang/rust#147007 (Explicitly note `&[SocketAddr]` impl of `ToSocketAddrs`)
 - rust-lang/rust#147008 (bootstrap.py: Respect build.jobs while building bootstrap tool)
 - rust-lang/rust#147013 (rustdoc: Fix documentation for `--doctest-build-arg`)
 - rust-lang/rust#147015 (Use `LLVMDisposeTargetMachine`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants